Do a s/babl_destroy/babl_exit since 'destroy' is better paired

with a 'create' and other libraries also use the 'init'/'exit'
pair, including GEGL. Keep a define for babl_destroy unless
BABL_DISABLE_DEPRECATED is defined.

* babl/babl-main.h
* babl/babl.c
* tests/babl-html-dump.c
* tests/babl_class_name.c
* tests/babl_fish_path_dhtml.c
* tests/babl_fish_path_fitness.c
* tests/conversions.c
* tests/formats.c
* tests/grayscale_to_rgb.c
* tests/introspect.c
* tests/models.c
* tests/nop.c
* tests/rgb_to_bgr.c
* tests/rgb_to_ycbcr.c
* tests/sanity.c
* tests/srgb_to_lab_u8.c
* tests/types.c

svn path=/trunk/; revision=386

diff --git a/ChangeLog b/ChangeLog
index fd8802033ca113a835cfeae4a2fcfd8df9025eb3..7457178acfb69e7f3428872a98639d52cdfa693b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2009-01-18  Martin Nordholts  <martinn@svn.gnome.org>
+
+       Do a s/babl_destroy/babl_exit since 'destroy' is better paired
+       with a 'create' and other libraries also use the 'init'/'exit'
+       pair, including GEGL. Keep a define for babl_destroy unless
+       BABL_DISABLE_DEPRECATED is defined.
+
+       * babl/babl-main.h
+       * babl/babl.c
+       * tests/babl-html-dump.c
+       * tests/babl_class_name.c
+       * tests/babl_fish_path_dhtml.c
+       * tests/babl_fish_path_fitness.c
+       * tests/conversions.c
+       * tests/formats.c
+       * tests/grayscale_to_rgb.c
+       * tests/introspect.c
+       * tests/models.c
+       * tests/nop.c
+       * tests/rgb_to_bgr.c
+       * tests/rgb_to_ycbcr.c
+       * tests/sanity.c
+       * tests/srgb_to_lab_u8.c
+       * tests/types.c
+
 2009-01-18  Martin Nordholts  <martinn@svn.gnome.org>
 
        * babl/babl-classes.h: New file collecting the type constants,

diff --git a/babl/babl-main.h b/babl/babl-main.h
index e0a7fa310af8834a5cd6eb07c029facbd571c23d..8cfafa5f27eb2962e71321fb0e0735c5987a5411 100644 (file)
--- a/babl/babl-main.h
+++ b/babl/babl-main.h
@@ -23,13 +23,24 @@
 #error  this file is only to be included by babl.h
 #endif
 
-/** Initialize the babl library */
+/**
+ * Initialize the babl library
+ */
 void   babl_init       (void);
 
-/** Deinitialize the babl library (frees any resources used, if the number
- *  of calls to babl_destroy() is is equal to the number of calls to
- *  babl_init()
+/**
+ * Deinitialize the babl library (frees any resources used, if the
+ * number of calls to babl_exit() is is equal to the number of calls
+ * to babl_init()
  */
-void   babl_destroy    (void);
+void   babl_exit       (void);
+
+
+#ifndef BABL_DISABLE_DEPRECATED
+
+#define babl_destroy babl_exit
+
+#endif /* BABL_DISABLE_DEPRECATED */
+
 
 #endif

diff --git a/babl/babl.c b/babl/babl.c
index a64a7eeede14ce070be10c7d715ba9e7a88af577..91ccb17ec71038190f4bb907387d1b51c8a6959e 100644 (file)
--- a/babl/babl.c
+++ b/babl/babl.c
@@ -46,7 +46,7 @@ babl_init (void)
 }
 
 void
-babl_destroy (void)
+babl_exit (void)
 {
   if (!-- ref_count)
     {

diff --git a/tests/babl-html-dump.c b/tests/babl-html-dump.c
index b41548785371b2f243427cfc9aac20c110f913ea..1f3def8356663aecaffd67e5cf4b97abb1711eb8 100644 (file)
--- a/tests/babl-html-dump.c
+++ b/tests/babl-html-dump.c
@@ -79,7 +79,7 @@ main (void)
    printf ("</div>\n");
    printf ("</div>\n");
  */
-  babl_destroy ();
+  babl_exit ();
 
   return 0;
 }

diff --git a/tests/babl_class_name.c b/tests/babl_class_name.c
index a8d300158a5e01817debb29bfb56248e9b8df029..01e1c4150172627579df3946e572fbc098cdac21 100644 (file)
--- a/tests/babl_class_name.c
+++ b/tests/babl_class_name.c
@@ -68,6 +68,6 @@ main (int    argc,
   babl_init ();
   if (test ())
     return -1;
-  babl_destroy ();
+  babl_exit ();
   return 0;
 }

diff --git a/tests/babl_fish_path_dhtml.c b/tests/babl_fish_path_dhtml.c
index 9405fc8ee140d787a93a2a98c0a3c431cdff4cd4..b9f52f58ccc7f10968f33ba7b718019caf2b429f 100644 (file)
--- a/tests/babl_fish_path_dhtml.c
+++ b/tests/babl_fish_path_dhtml.c
@@ -8,7 +8,7 @@ int main (void)
   babl_set_extender (babl_extension_quiet_log ());
   babl_fish_stats (stdout);
 
-  babl_destroy ();
+  babl_exit ();
 
   return 0;
 }

diff --git a/tests/babl_fish_path_fitness.c b/tests/babl_fish_path_fitness.c
index f423f00afcd37d0e10eccf67ea032049647ba92b..9ac312f386825c8cb68b56281c8ec427e28d0032 100644 (file)
--- a/tests/babl_fish_path_fitness.c
+++ b/tests/babl_fish_path_fitness.c
@@ -89,7 +89,7 @@ int main (void)
   /*printf ("ok / total : %i %i %f\n", ok, total, (1.0*ok) / total);
    */
 
-  babl_destroy ();
+  babl_exit ();
 
   return 0;
 }

diff --git a/tests/conversions.c b/tests/conversions.c
index 2e05983f98a022680e2aec95660a927e57357982..9efe2c6aca00091aad7459ddede2e79ffd205ba4 100644 (file)
--- a/tests/conversions.c
+++ b/tests/conversions.c
@@ -30,7 +30,7 @@ int main (void)
   babl_set_extender (babl_extension_quiet_log ());
   babl_conversion_class_for_each (each_conversion, NULL);
 
-  babl_destroy ();
+  babl_exit ();
 
   return !OK;
 }

diff --git a/tests/formats.c b/tests/formats.c
index 9bf9b9dc3f7f5cfc05348a9406e81d947dcc78ca..a3852f7f9a0712acb68a6b3af15ca2cc9816d713 100644 (file)
--- a/tests/formats.c
+++ b/tests/formats.c
@@ -20,7 +20,7 @@ int main (void)
   babl_set_extender (babl_extension_quiet_log ());
   babl_format_class_for_each (format_check, (void *) 1);
 
-  babl_destroy ();
+  babl_exit ();
 
   return 0;
 }

diff --git a/tests/grayscale_to_rgb.c b/tests/grayscale_to_rgb.c
index 00a150bdc710d1d972be1f59270e9e8dbdead3da..698cdd9aa6eea41acbc0e52beff8bc6daf48c438 100644 (file)
--- a/tests/grayscale_to_rgb.c
+++ b/tests/grayscale_to_rgb.c
@@ -76,7 +76,7 @@ main (int    argc,
   babl_init ();
   if (test ())
     return -1;
-  babl_destroy ();
+  babl_exit ();
   return 0;
 }
 

diff --git a/tests/introspect.c b/tests/introspect.c
index 1734c3b3da0f1d6ffe65e10c50f93b46d2e85a4d..fb5b8fcaef98b546fb2055b0f0df760a52d7b32a 100644 (file)
--- a/tests/introspect.c
+++ b/tests/introspect.c
@@ -24,6 +24,6 @@ main (int    argc,
 {
   babl_init ();
   babl_introspect (NULL);
-  babl_destroy ();
+  babl_exit ();
   return 0;
 }

diff --git a/tests/models.c b/tests/models.c
index f54dca7aa14b5aa29a8f5cbc6f8595befa7ffc86..1922a35d83a0c6af2c84b99c1c071f575dbb6323 100644 (file)
--- a/tests/models.c
+++ b/tests/models.c
@@ -27,7 +27,7 @@ int main (void)
   babl_set_extender (babl_extension_quiet_log ());
   babl_model_class_for_each (model_check, NULL);
 
-  babl_destroy ();
+  babl_exit ();
 
   return !OK;
 }

diff --git a/tests/nop.c b/tests/nop.c
index ca21591f74c8842e852bdce7524fa49571b44f0a..883d9d8d258769b231e64e03510948593d1d82a6 100644 (file)
--- a/tests/nop.c
+++ b/tests/nop.c
@@ -23,6 +23,6 @@ main (int    argc,
       char **argv)
 {
   babl_init ();
-  babl_destroy ();
+  babl_exit ();
   return 0;
 }

diff --git a/tests/rgb_to_bgr.c b/tests/rgb_to_bgr.c
index fd5cab55d5a180141831943a5b6069cb7a12bdeb..a60bca5a3d02dc0ebee295ca942abd620dba956b 100644 (file)
--- a/tests/rgb_to_bgr.c
+++ b/tests/rgb_to_bgr.c
@@ -84,6 +84,6 @@ main (int    argc,
   babl_init ();
   if (test ())
     return -1;
-  babl_destroy ();
+  babl_exit ();
   return 0;
 }

diff --git a/tests/rgb_to_ycbcr.c b/tests/rgb_to_ycbcr.c
index 4928a6f4727d102793f95800cc45bc2ff108915e..efee80c1424c5d7768a226a1e2f47ea77e4011f8 100644 (file)
--- a/tests/rgb_to_ycbcr.c
+++ b/tests/rgb_to_ycbcr.c
@@ -91,6 +91,6 @@ main (int    argc,
   babl_init ();
   if (test ())
     return -1;
-  babl_destroy ();
+  babl_exit ();
   return 0;
 }

diff --git a/tests/sanity.c b/tests/sanity.c
index e2798e374e3bad2c2ac0ddff0d11ef2bbee405d6..482f21842c522b950aa825ffbccb94c5b878aaad 100644 (file)
--- a/tests/sanity.c
+++ b/tests/sanity.c
@@ -25,6 +25,6 @@ main (int    argc,
   babl_init ();
   if (!babl_sanity ())
     return -1;
-  babl_destroy ();
+  babl_exit ();
   return 0;
 }

diff --git a/tests/srgb_to_lab_u8.c b/tests/srgb_to_lab_u8.c
index fe4197219e8b97e0c2e26267d21e7792b417c98b..8d7c7b7287e77152dc113e0262a37664659ecc53 100644 (file)
--- a/tests/srgb_to_lab_u8.c
+++ b/tests/srgb_to_lab_u8.c
@@ -71,6 +71,6 @@ main (int    argc,
   babl_init ();
   if (test ())
     return -1;
-  babl_destroy ();
+  babl_exit ();
   return 0;
 }

diff --git a/tests/types.c b/tests/types.c
index 8a7551d88f0effdb36d001b7b6f3a6eec07fd785..9e53d2415929e60408b294215e7c3798d0c204b6 100644 (file)
--- a/tests/types.c
+++ b/tests/types.c
@@ -21,7 +21,7 @@ int main (void)
   babl_set_extender (babl_extension_quiet_log ());
   babl_type_class_for_each (type_check, NULL);
 
-  babl_destroy ();
+  babl_exit ();
 
   return !OK;
 }